luci-mod-network: organize "dnssec" tab in dhcp/dns views

Delete the tab from dhcp.js, sort the options that belong to it in dns.js.

Signed-off-by: David Härdeman <[email protected]>

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index efd94d25865e60dab9499ab443cf338a882e3bc7..4bbe8187fc9567eeec9139296ea9a901e11a6fd5 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -391,7 +391,6 @@ return view.extend({
 
                s.tab('general', _('General'));
                s.tab('devices', _('Devices & Ports'));
-               s.tab('dnssecopt', _('DNSSEC'));
                s.tab('filteropts', _('Filter'));
                s.tab('forward', _('Forwards'));
                s.tab('limits', _('Limits'));
@@ -670,19 +669,6 @@ return view.extend({
                        _('This prevents unreachable IPs in subnets not accessible to you.') + '<br />' +
                        _('Note: IPv4 only.'));
 
-               if (L.hasSystemFeature('dnsmasq', 'dnssec')) {
-                       o = s.taboption('dnssecopt', form.Flag, 'dnssec',
-                               _('DNSSEC'),
-                               _('Validate DNS replies and cache DNSSEC data, requires upstream to support DNSSEC.'));
-                       o.optional = true;
-
-                       o = s.taboption('dnssecopt', form.Flag, 'dnsseccheckunsigned',
-                               _('DNSSEC check unsigned'),
-                               _('Verify unsigned domain responses really come from unsigned domains.'));
-                       o.default = o.enabled;
-                       o.optional = true;
-               }
-
                s.taboption('filteropts', form.Flag, 'nonegcache',
                        _('No negative cache'),
                        _('Do not cache negative replies, e.g. for non-existent domains.'));

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
index 50dbd220abcd7b576c194f2d41374a0dadbc14fb..59d9f45f339e49f9b97404e34ea5a28e33905932 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
@@ -769,6 +769,21 @@ return view.extend({
                };
                // End dnsrecords
 
+               // Begin dnssec
+               if (L.hasSystemFeature('dnsmasq', 'dnssec')) {
+                       o = s.taboption('dnssecopt', form.Flag, 'dnssec',
+                               _('DNSSEC'),
+                               _('Validate DNS replies and cache DNSSEC data, requires upstream to support DNSSEC.'));
+                       o.optional = true;
+
+                       o = s.taboption('dnssecopt', form.Flag, 'dnsseccheckunsigned',
+                               _('DNSSEC check unsigned'),
+                               _('Verify unsigned domain responses really come from unsigned domains.'));
+                       o.default = o.enabled;
+                       o.optional = true;
+               }
+               // End dnssec
+
                s.taboption('filteropts', form.Flag, 'domainneeded',
                        _('Domain required'),
                        _('Never forward DNS queries which lack dots or domain parts.') + '<br />' +
@@ -999,19 +1014,6 @@ return view.extend({
                        _('This prevents unreachable IPs in subnets not accessible to you.') + '<br />' +
                        _('Note: IPv4 only.'));
 
-               if (L.hasSystemFeature('dnsmasq', 'dnssec')) {
-                       o = s.taboption('dnssecopt', form.Flag, 'dnssec',
-                               _('DNSSEC'),
-                               _('Validate DNS replies and cache DNSSEC data, requires upstream to support DNSSEC.'));
-                       o.optional = true;
-
-                       o = s.taboption('dnssecopt', form.Flag, 'dnsseccheckunsigned',
-                               _('DNSSEC check unsigned'),
-                               _('Verify unsigned domain responses really come from unsigned domains.'));
-                       o.default = o.enabled;
-                       o.optional = true;
-               }
-
                s.taboption('filteropts', form.Flag, 'nonegcache',
                        _('No negative cache'),
                        _('Do not cache negative replies, e.g. for non-existent domains.'));